From 5e91bc5c8ac6ddb6ff36efe9ab84bcf9047cea5a Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 18 Oct 2005 19:28:16 +0100 Subject: [PATCH] Fix -xen builds. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c | 4 ++-- linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c index 20f96c0da3..a0ec7cff1f 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c @@ -74,10 +74,10 @@ cpumask_t cpu_sibling_map[NR_CPUS] __cacheline_aligned; cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned; EXPORT_SYMBOL(cpu_core_map); -#ifdef __i386__ +#if defined(__i386__) u8 x86_cpu_to_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = 0xff }; EXPORT_SYMBOL(x86_cpu_to_apicid); -#else +#elif !defined(CONFIG_X86_IO_APIC) unsigned int maxcpus = NR_CPUS; #endif diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h index 427f6c8a38..cf404f492b 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/smp.h @@ -54,6 +54,7 @@ extern u8 x86_cpu_to_apicid[]; #define __smp_processor_id() (current_thread_info()->cpu) extern cpumask_t cpu_possible_map; +#define cpu_callin_map cpu_possible_map /* We don't mark CPUs online until __cpu_up(), so we need another measure */ static inline int num_booting_cpus(void) -- 2.30.2